Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 9 May 2010 22:52:44 +0000 (22:52 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 9 May 2010 22:52:44 +0000 (22:52 +0000)

Trivial merge